From d7681e7c34ed1a2838514c1bec0b949e8952e78c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 3 Mar 2004 21:26:31 +0000 Subject: [PATCH] Strip out the "export-dynamic" libtool option from library link lines. Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool option from library link lines. (#124687, James Henstridge) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 20 ++++++++++++++++++++ 6 files changed, 45 insertions(+) diff --git a/ChangeLog b/ChangeLog index 82cace02e0..d92ae9c3ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 3 16:00:10 2004 Owen Taylor + + * configure.in: Strip out the "export-dynamic" libtool + option from library link lines. (#124687, James Henstridge) + Wed Mar 3 16:06:03 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82cace02e0..d92ae9c3ab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Mar 3 16:00:10 2004 Owen Taylor + + * configure.in: Strip out the "export-dynamic" libtool + option from library link lines. (#124687, James Henstridge) + Wed Mar 3 16:06:03 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 82cace02e0..d92ae9c3ab 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Mar 3 16:00:10 2004 Owen Taylor + + * configure.in: Strip out the "export-dynamic" libtool + option from library link lines. (#124687, James Henstridge) + Wed Mar 3 16:06:03 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 82cace02e0..d92ae9c3ab 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Mar 3 16:00:10 2004 Owen Taylor + + * configure.in: Strip out the "export-dynamic" libtool + option from library link lines. (#124687, James Henstridge) + Wed Mar 3 16:06:03 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 82cace02e0..d92ae9c3ab 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Mar 3 16:00:10 2004 Owen Taylor + + * configure.in: Strip out the "export-dynamic" libtool + option from library link lines. (#124687, James Henstridge) + Wed Mar 3 16:06:03 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb): diff --git a/configure.in b/configure.in index 2c4e8f0823..922c6fb196 100644 --- a/configure.in +++ b/configure.in @@ -1418,6 +1418,26 @@ AC_SUBST(GTK_DEP_CFLAGS) AC_SUBST(GTK_DEBUG_FLAGS) AC_SUBST(GTK_XIM_FLAGS) +################################################################ +# Strip -export-dynamic from the link lines of various libraries +################################################################ + +# +# pkg-config --libs gmodule includes the "export_dynamic" flag, +# but this flag is only meaningful for executables. For libraries +# the effect is undefined; what it causes on Linux is that the +# export list from -export-symbols-regex is ignored and everything +# is exported +# +export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` +if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` + GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` +fi + + ################################################## # Checks for gtk-doc and docbook-tools ################################################## -- 2.30.2